Revert 73ae9ec..fc2f537

This rolls back to commit 73ae9ecdc748fac5765f90c8c85813d588f1580e.
Revert fc2f537..21210ac

This rolls back to commit fc2f537514d4da485bd1b5217c0e7273fdaa3b8f.
dd