Revert 66909dc..431c93c

This rolls back to commit 66909dc5fae6bd993ad9ce230946b5ce371171fa.