Revert 2ba72ed..beb1e82

This rolls back to commit 2ba72ed23b21cea58e603281804f218204a99ad1.