Revert a2aacf3..23ca3d0

This rolls back to commit a2aacf3ae00551f86c5297508200d11ebfe9c4ed.