Revert 13c50b0..2dadeda

This rolls back to commit 13c50b05fa94205782ce31316aa6e6900cc39e69.