Revert d6afcc3..1dd8447

This rolls back to commit d6afcc39c3667ac61d1f6ed47982cf6e553f6c58.