Revert 125d4c6..a11dfe6

This rolls back to commit 125d4c6d74ab49399823874f8ed473ef73105b29.