Revert f4658da..3e57e1a

This rolls back to commit f4658da380e1ec8b1de4fd094e00102b1dcd3336.