Revert c3c3038..af50582

This rolls back to commit c3c3038798c81f5c0ac64e7a18b6233c6055e836.