Revert 55307f0..92ffc7c

This rolls back to commit 55307f00601b272f9a5e6cee43fc1150c4a1408e.