Revert 650fd4a..d1aa95f

This rolls back to commit 650fd4a662707aad8e6c8e42977156da7f331af2.