Revert a5104ce..0ad63b7

This rolls back to commit a5104ceea04a342cdda21d93a0419115eddd285b.