Revert b36e1d1..0fcc553

This rolls back to commit b36e1d1833b15acfffa5a95c096196c852ebd71f.