Revert 79d8416..9788625

This rolls back to commit 79d8416594e75981a4c420b52911c088989dabfe.