Revert of previous 2 commits