Revert 2d3a497..00edab8

This rolls back to commit 2d3a497539969a5e288fb8ff06747378c466a9e8.
Saving station