Revert 0f8c9bc..941bb8c

This rolls back to commit 0f8c9bc8f3c736012cc25290b3cb8d81ca4c2dd2.