Revert 37c5f81..41826d9

This rolls back to commit 37c5f816817262f99f0267496e9aa7484a7f3f7d.