Revert 56bb8ad..e7c0184

This rolls back to commit 56bb8ad2b211482d48b40fc4c0e09e997278db5d.