Revert 8bf18f2..2da6ac4

This rolls back to commit 8bf18f2fcdb18d058bd657670e71856e2b94fbc3.