reverting commit 5366, because of wrong commit reason