Revert 8eb314f..21f3cdc

This rolls back to commit 8eb314f7cb0931982f67b2b07a3835352b1c161e.