Revert dbbcef7..1ba272c

This rolls back to commit dbbcef7332a2bc6f489fb38f5e24aa0645af6565.