Revert 5a2a6cd..413a9f0

This rolls back to commit 5a2a6cd92c68092ad73e7995580fe7722c54a1f0.