Revert 54400ff..dfc99f2

This rolls back to commit 54400ffc622e1af93614cc722af8ea8977dedb67.