Revert b5c24e9..402a360

This rolls back to commit b5c24e9511e8cd6d61b7f1b8bbeecf3bc34df6bb.