Revert 503a025..d39a8ca

This rolls back to commit 503a025f93df874cbbfd2ee1204d006f3fe7c5af.