Revert 4c228e0..eec13a6

This rolls back to commit 4c228e0f1783627c5f7a5a6c6d1f19311546ae99.