Revert a5f7556..479eac4

This rolls back to commit a5f7556c54be5c23661399e49de22588bdb0d741.