Revert d6c7b1d..56a2376

This rolls back to commit d6c7b1d480524b387e56405da4f0c14953f537d7.