Revert 3a0d1e3..0cd27cd

This rolls back to commit 3a0d1e3717db926adfea91679d53e68cfa7f675d.