Revert 7a8ec1f..56a5dab

This rolls back to commit 7a8ec1f74e087715f74d7d1ef284e28eec99bdef.