Revert 495e8a9..9f545f0

This rolls back to commit 495e8a936e511689741ac3e7aa13fde55c62275c.