Revert 44934f1..e2b2194

This rolls back to commit 44934f17110d82db5eafd6aa1a0c6223e9425bd2.