Revert bc9e404..dcac19b

This rolls back to commit bc9e40453a382c3e9e3b6402cf6954242f9e8a55.