Revert 08388cc..18bbba4

This rolls back to commit 08388cc1669f43510c503e551c19313eae176ac9.