Revert 5f01653..be7567d

This rolls back to commit 5f01653ba771d70546fafd1a74eeb5af9e629a7c.