Revert bccc241..49d6094

This rolls back to commit bccc2411fb2a77a7907af0500f35324403296c5e.