Cont. (reverted from commit 4a7801c61406e56d502fd091ed9032aa11fedc7e)