Revert 7f59870..183b48f

This rolls back to commit 7f59870de81dc0717b6d392ba7c8d47310393321.