Revert 73d9a95..184118e

This rolls back to commit 73d9a95236d0e98fa7386c0301c780e97b6ac2df.