Revert 732f910..e749c1b

This rolls back to commit 732f910446f2b51a15b5129e202faf7501abbe16.