Revert 7de801a..6103e16

This rolls back to commit 7de801a41e8e54f3cab45c7e5d9eac726ec2da2a.