Revert 1f2a510..8eb2dc5

This rolls back to commit 1f2a510f6fb7298dbcaf48b849d73ec27c7a64dc.