Revert 07aae97..c3da92b

This rolls back to commit 07aae97da93af977076954fa891b2a631827999b.