Revert 41bd60d..5ab11f2

This rolls back to commit 41bd60d217c68c54d6a28b01389a92a19b6b3a96.