Revert 88bec45..35eb600

This rolls back to commit 88bec45a8a7382024203d1a78f5ff55320d50d4f.