Revert 407d2dc..6b55f85

This rolls back to commit 407d2dc3e4f25847e74eba688f96dcc0cf5e31fc.