Revert 091af3a..27f9d71

This rolls back to commit 091af3ae426f2f9effee373a14440376d757cee1.
Revert 27f9d71..f4aa041

This rolls back to commit 27f9d711ffdfbf25fa5e7d3b76fc3fc7a1589aaf.