Revert c9bc760..838b8dd

This rolls back to commit c9bc760eb47ecfaf403d1149c108bb569c2bee53.