Revert 8f135e1..db26bff

This rolls back to commit 8f135e1c2713d3b4b74b75b87449232bcb6557ce.