Revert 8d2368b..a096643

This rolls back to commit 8d2368b949ea32abd8c0d80d7b1163082a4985d0.