Revert 20b465e..2d62eba

This rolls back to commit 20b465e0a0a1a15526c63549f0d869aeedfbbf54.