Revert 6bf217f..a4f7c54

This rolls back to commit 6bf217f5e5547e50670c45764be9932f601a89de.