Revert 14ff100..a079f27

This rolls back to commit 14ff100b92679a93129db9f1664e9af957d53d51.