Revert 243a250..dd8662e

This rolls back to commit 243a250fb5c53a519d6d9f2188bd41873b75df27.