Revert 01f6e2d..6c7ab20

This rolls back to commit 01f6e2d8959392851f414453051411bd42a0a3d6.