Revert 19813a0..341494e

This rolls back to commit 19813a0ed2ff63bb54a365a89e7409047c9055bf.