Revert 316292c..8326b1e

This rolls back to commit 316292c6d5d0965fbfc33b94dc684c91692fe661.