Revert 2db49d8..45c458a

This rolls back to commit 2db49d8a7c99c4b39b36e1f4fc733291fdd40f44.