Revert 0c28e77..ce30d7b

This rolls back to commit 0c28e775734503564498e654f12385abf8c378ba.