Revert 1286cbd..f0a68db

This rolls back to commit 1286cbd5b94a8e28433b7c0052ba19d89adbc839.