Revert 77392a2..3c2cf55

This rolls back to commit 77392a2ec3e9b807a9347c7c5f28b78c1ffb7362.