Revert 970064b..bdc41e5

This rolls back to commit 970064b095882b23c06149a519413a17b3deccc9.