Revert f5201e1..b28942b

This rolls back to commit f5201e1c2673086f1c23d300afeb3aab0916ffc4.