Revert 604eb92..edddc5c

This rolls back to commit 604eb92fdff90b434b0dc01098263cd09a556d03.