Revert 6bed6cf..f3765c6

This rolls back to commit 6bed6cf7512e103b61f0879f39256bb625765076.