Revert c849790..6aa9b01

This rolls back to commit c849790977efe1558f19bceb6cf9497322725cb3.