Revert 7dd112b..9318bf7

This rolls back to commit 7dd112b73656a6228ab2355949978acb3582a46c.
Improved Performance