Revert c40248b..3aa502c

This rolls back to commit c40248b9aca99e71b2c27d2b5a5d3c9f5f1aded2.