Revert d14e605..6accb06

This rolls back to commit d14e605ec40b5a9aa17ab05e9810dcbba09c9096.