Revert 40680f7..2320d1d

This rolls back to commit 40680f7c291c3bf2bf6c873a9667157f130e0fae.