Revert 1d2927a..321948b

This rolls back to commit 1d2927a1a4189447ed41966d0c8f2dd4fa8a8ba7.