Revert bdc834c..4f845e7

This rolls back to commit bdc834c96e8617a72a7a2a319f0fa3dd17ff58e0.