Revert c4196f3..a14257a

This rolls back to commit c4196f3742ec7324f575b331bf88e9747643daf7.