Revert 7c96564..02913f6

This rolls back to commit 7c96564bd83b3e42f850083b422b4cef59d148d2.