Revert 3e6abc2..6f477a4

This rolls back to commit 3e6abc2681f61e33472e41240a8b1412fe6d06d5.