Revert 8d4bae6..43d1e16

This rolls back to commit 8d4bae60fe24ff4a91dccd364bb1ab06cc5a8103.