Revert c12e08b..afe2d40

This rolls back to commit c12e08bca421240a96c4913be266b75ab047cd3f.