Revert c16a01a..ae09f46

This rolls back to commit c16a01af0cd33d9541df873931d89845948a5258.