Revert bdfba11..110454a

This rolls back to commit bdfba1110a8a6f6a4a1b23d2f458254909b6bb9e.