Revert a120da5..378266d

This rolls back to commit a120da52efadc18f89d67b7e568fba84ab3787af.