Reverted changes of commit 6ad7f75a3777652a535ef4356e6d193eed4ed612