Revert 3afe697..b236556

This rolls back to commit 3afe697d2a1d50f454038af1fed271f6bebf829b.