Revert eb23d8c..8bac7fe

This rolls back to commit eb23d8c4a71953b34dc0609246393797f52f3830.