Revert 7b8de4e..536f7c5

This rolls back to commit 7b8de4eeaac8aff8d5699cc51fdadbef7443daed.