Revert 9ffeabd..f288ba2

This rolls back to commit 9ffeabdf9c20972cecb5ee426e0c9e787216a4f0.