Revert 977bff5..9198320

This rolls back to commit 977bff5bc93d87c5593b971e12de2b4be010c701.