Revert 6062bef..630f87e

This rolls back to commit 6062bef3451145582a12053769bcc3cfa04f9c2a.