Revert 7bfe50c..9d6935a

This rolls back to commit 7bfe50caf251f7cb761343328975bf15217133fb.