Revert c594335..d2af30f

This rolls back to commit c59433576b419db32ea936547e8f3e91b5f98c01.