Revert a7583e2..9252746

This rolls back to commit a7583e219b1db18f6f2c47871339f815d3da47fa.