Revert 4c3e467..b873ee9

This rolls back to commit 4c3e4672eb95fd30253e3b03c34546c4f0dc09d2.