Revert 1223a5d..cf6e0ec

This rolls back to commit 1223a5d9becfa2b49d0b9da832040fa648bef660.