Revert b84d79f..429e49c

This rolls back to commit b84d79f3fd6ea50922ddaa27f605e4ce7dd36bfe.