Revert 508b062..1066ded

This rolls back to commit 508b0628e96f71322c93a327573c5ed9e633afac.