Revert 7493856..ae69a9d

This rolls back to commit 7493856f1a506145d4a8c2f540157717704837fb.