Revert 6a5575b..2c66eed

This rolls back to commit 6a5575bea6754b25ee9d0eaa4ce8583b14a9204c.
revert change