Revert 49e9660..a18f38a

This rolls back to commit 49e9660581eb34ba7d25288be96d7fcbb2be1b96.