Revert 94adebc..c3b86a9

This rolls back to commit 94adebc63049669c17754d7c9c31207584920f44.