Revert a3048f4..b6c274c

This rolls back to commit a3048f40de91395a31bb600f45e896df91ec17ea.