Revert 3403df9..f4310d6

This rolls back to commit 3403df9037498db32c64046a9108877ce30486f0.